Merge branch 'master' of https://github.com/gpsbabel/gpsbabel
authorRobert Lipe <robertlipe@gpsbabel.org>
Tue, 20 Oct 2015 00:42:25 +0000 (19:42 -0500)
committerRobert Lipe <robertlipe@gpsbabel.org>
Tue, 20 Oct 2015 00:42:25 +0000 (19:42 -0500)

Trivial merge